Update generated file
Merge branch 'master' into fix-annos