test 73ff5b02-5aa4-468b-ad04-b9943de609fb (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue