Merge branch 't/autogen'