[PLAT-4449]
[PLAT-4450]