Merge "Add version to compliant operational policies"