PLAT-6840 review comments