Don't evaluate filtersets when there are none
Merge remote-tracking branch 'origin/development' into development