test bf8bb608-352e-4a1e-8e55-a57a1d4756d9 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue