test 264997e5-390e-42b3-886b-9d3a442f3528 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue