test 2772594e-9aa5-4247-b6fd-b6115989cacb (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue