Merge "Add precompiled hash only when policy exists"