Merge "Fix docs build issue"