Release jan 10 editcount refactor