Merge "resolved-policy view - initial commit"