test 6d2585ef-f49d-4cc0-afe9-520fca3e8ba1 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue