Merge "Updates to policy documentation"