test cccc9009-ab44-46a0-9dbf-190d3a610f31 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue