Add in backoff implementations
Merge branch 'master' into feature/oh_point_one_point_oh