test 4f9a2bb9-8e5e-4513-84f6-fae8e8d61993 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue