trunk-r6963