test 061d3f03-ca8f-4f7e-8f37-f66d3d33cb06 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue