test 8477af68-fbbe-464b-a5bd-689e8e30b331 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue