TRUNK-4359 Post review adjustements