Build 7884 of branch trunk