Merge branch 'features/9664-annotation-count-display' into dev Re #9664
Custom badge component added
Re #9582