test 079fd234-6c77-4194-b8a5-e3be454a7fcd (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue