PLAT-6485/PLAT-6487 - FixUp from PR