test 6d683fba-0c41-4abc-838f-40f03400aae7 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue