Fixed the banner tracker. A new PR for #3518 and #3519.
Merge pull request #3740 from roland-d/banner-counter

Fixed the banner tracker.