Merge "Added InstanceIdentifier to code generation"