test 0e6d6d6c-aeb4-4b3c-a298-2b4b06f4c085 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue