PLAT-6499 - FixUp from PR