test ef4a91a0-7a2d-4903-bcd1-00ef17bff135 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue