We are also experiencing a similiar issue.

Is the Code Generation Tool 3.3.3 the current workaround suggested?

If so, would you mind pointing us to a resource that we can ensure we are using the correct version?