test 457cd8ce-da00-482c-abe8-4672a4c942bc (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue