* rebase
* fix lint error
* fix errors
* add itest
* make gen after rebase
* apply suggestion from review
* make gen after latest rebase
* gen after rebase
* fix waitgroup
* change as per review
* refactor Recovery Batches
* fix CLI
* gen after rebase
* close the channel