test 09a33040-629b-46c7-abd7-2774372f7250 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue