Merge branch 'nexthop-fix-two-nexthop-group-statistics-issues'