test 640c4ab0-1ec8-48fe-ae0c-0f086ec113ef (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue