Code generation update on master