Build 8804 of branch trunk