[TRUNK-4033] made some changes