test 0c54b43c-1b2e-44bd-96dc-45b7cb5383e4 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue