Merge branch 'nto-signal-stats'