trunk-r6963
