[HELIX-380] Incompatibility issue with HELIX_PROPERTYSTORE, fix rat