Merge branch 'commtrack-makethehurtingstop' into staging