test 2e5dd8f5-d411-4a5f-985f-11838be81493 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue