test 34740a2e-f10f-4c7e-aa8c-30a91cb1ddd9 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue