test cd3a5324-a958-4f0b-9b3a-5cd14b150673 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue