test cea3ff3f-342c-4a52-a0fc-609613cc8a0b (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue