Merge "Added support for source code generation from identity statement, grouping...