test 4ac62d70-bd30-4612-8638-fa3eb792bb90 (rebased onto develop)



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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue