[PLAT-6640] Fixing PR comments