Code review mark-ups
Merge branch 'issue191' into geo_redundancy