test 99e03a00-e74a-418c-82b6-5636b53fadd7 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue