test 2de0b879-5f6f-4d12-b53a-9a00698caac6 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue