fix rule list row counting
Merge branch 'master' into release-2.0