test f4d77ab7-54de-46bb-81e8-2a94bd0123eb (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue