test 0d1417f9-3cd6-4ea8-82d0-b1e5c4d57817 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue