test 53a3ec34-da3f-44e6-9a53-066973380263 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue