Merge "Continue pausing after entering pip2" into main