test 9154c709-d9eb-4bdc-9de3-3254b2e6e96c (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue