Merge "[POLICY] Remove field undefined in deployment"