test 99dba21c-6d4e-4957-bd7d-83dcdf146af4 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue