Merge branch 'master', remote-tracking branch 'origin'
Fix for showing first default group on empty list