Merge "DOC - Fixing doc linking issue"