Changes for merge with chrishunt/favcount