test c465d2e9-4015-4a0c-b6d7-5184ca7ffea9 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue