Merge pull request #10721 from Dentomologist/fix_warnings_on_generic_builder Fix warnings on generic builder