[JBTM-1611] Make recovery passes configurable
Merge branch 'JBTM-1611'