Merge "Fixed bug in code generator when handling case defined in grouping as augment...