DOCS-123 Updated with feedback from AF