test e6bd973e-77e3-4915-851c-3ba320456e72 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue