Please review branch feature/daemonstats