Merge "fix fields not set correctly in Fabric Policy dist"