test 91be4d6f-793d-4125-806a-6f13a463d466 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue