cleanup and support for try excepting the denormalized count
Merge remote-tracking branch 'origin/master'