test 3db65ebf-3cbc-4983-bedb-9170ba8c0286 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue