test 01f21012-e0db-42fe-8a93-8e8c3dd10845 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue