PLAT-6505 - FixUp PR