Updated generated files for recent merges