WIP
Merge branch 'master' into tests
Doc Updates and changelog
Added consumer recovery test