Merge "Fix support lib docs build"