test 3a8adf30-a176-402a-b408-37fadee139f0 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue