Merge "Policy Architecture documentation"