add original tags to make generate faster
Merge branch 'master' into HEAD