[PLAT-6703] Further comments from PR