test 5afc9765-fdc7-4ada-8451-b3eeec0bf1c5 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue