test 59a680ff-2236-408e-80d5-4b1e40d531c9 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue