trunk-r6058