test c0604fc5-a7bf-411c-8c07-a01f9dd1d61b (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue