Merge "Fix for Bug 511 (code-generator)"