test c196fecb-d143-4f7e-b322-301dc4e7e00a (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue