test 25ecfd0c-9112-4308-877f-d1df08f1bda7 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue