Merge branch 'revert-autogen-subdirs' into release