test 744ed745-af35-4a5c-bcb7-013aab5eb383 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue