TRUNK-4294