Merge "Fix policy"