Properly merged category_codegen into master.