test f3e518f1-0df5-410d-8c85-34e0b9062b6b (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue