PLAT-6462 - FixUp from PR