test f3c97cfc-87b8-4b3a-bc69-7f7019e19155 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue