Improved read repair behaviour.
Merge branch 'test' into dev