Merge branch 'stop_remote_instead_of_pause'