test a659915c-c4db-4f27-98f8-7bbc90841d52 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue