Merge "Add IntEnumMapping"