PLAT-4216 fixed bad merge