test 849ac88a-fd3f-4cc0-b73e-69230e7296d4 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue