First commit
Merge from github autogen files