Merge "Resolved policy contracts"