Updates to generated files as of commit 9115fd57c1