remove deprecated entry in manifest
update autogen file
Merge branch 'master' into develop