test fc7dbd48-c629-4a04-9c58-5d1ea88c8e4d (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue