test 36041abc-34c0-4abd-9059-098988be7dd5 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue