Merge "Remove remaining warnings during Documentation buildings"