[TRUNK-3624] made some changes