Merge "Better handling of jobs execution in post-connection shutdown"