Merge branch 'fix/17037_fix_groupBy_operation_type_to_develop' into 'develop'

fix/17037 : fix typo in variable name and modify event json column number for originator type

See merge request !664 (merged)