validate auth policy configuration
merge upstream changes