test 2dc44d03-dc34-4501-87d7-174dce712741 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue