test 78c558f8-0bd8-4b5c-8c28-44e16fdc946d (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue