test e159bba7-5aae-4779-8e3d-79bd105d47d8 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue