TRUNK-resolved review comments