merge PLAT-599 to IX-9.11.0