limit conducts count to vanilla conducts for variants that extend it carelessly
Merge branch 'master' into production