test 98810b81-4cba-46d2-9501-326a31a23feb (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue