Merge branch 'jg/cguide-we-cannot-count' into maint