test 933267cd-1ee7-42ef-bb39-c56812a0a9ad (rebased onto develop)


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

----

This is a call to Sandbox.open_pr by testPushRebaseContinue