test 7f3cd62b-11dd-454c-887e-e258eeb9166f (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue