Release 204 editcount refactor