TRUNK-2682