test cf023e22-e000-42c5-9759-4dab1db4d3dc (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue