Fixes issue where max questions per group and max groups was not correctly handled
Merge remote-tracking branch 'origin/develop' into develop