TRUNK-2999 Post review fixes