Build 9229 of branch trunk