TRUNK-4375 Follow up changes