TRUNK-3499 made some changes according to the previous reviews