Build 9487 of branch trunk