2336: filter tasks properly when building language lists
2337: check for empty language list properly
Merge branch 'i-2337' into staging
Merge branch 'i-2336' into staging