TRUNK-4160 Review comments