2.2 Backported enhancements in signature counts