Merge kit code and fix for EC /who <-> BeardStat