TRUNK-4327 nfowler