test 43ca1035-66ab-4a59-9e08-68883bf36aec (rebased onto develop)



This is the same as gh-3980 but rebased onto develop.

----

This is a call to Sandbox.open_pr by testPushRebaseContinue