Merge "Support POLICY_FLAG_ALT et. al."