test 0a815dbf-e5b9-41f4-a1b0-de63710a00d2 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue