Fixed bug in grouping handler that tried to access old format.
Merge branch 'test' into dev
Removed image version check
Merge branch 'test' into dev