test 18748134-0e6d-4fb7-a4c5-60088f9902d1 (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue