test a3bec40c-f38e-4d24-a734-00f2c0427554 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue