test 3f8e9577-5449-49b5-ab36-70a88ead9214 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue