Merge "refactor statspuller"