test e11baf35-c0aa-436b-9ade-d8d8fe8d89b9 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue