CONNECT-157 Correct dependencies for code generation