test 4d6db4d4-018f-4dae-a12e-ee1a7e9dc04c (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue