2.1 commit with recovery fixes