Merge branch 'hotfix-2.1.11'
Version bumped to 2.1.12
Added a flag to mark a group as "completed".
Merge branch 'hotfix-2.1.12' into develop