test 21d5f0a9-552c-46d7-8535-244beff056f7 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue