TRUNK-3850

made changes according to trunk-3850