Merge "Add missing <iterator> include for std::inserter" into main