Merge "Fix doc build"