Merge "Fix docs build"