fine grained code for TRUNK-3267