Fix non-existing variable
Merge remote-tracking branch 'origin/develop' into develop
Insert grouping