Implement consistency modes
Version bump
Merge branch 'release/1.4.0' into develop