test 70354964-3cfb-4969-972e-68e36aed4de1 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue