LPS-37772 This property is handled in a generic way, so if we're changing one we need to change all of them