Keep iterating on this thing...
Merge branch 'feature/keep-columns-intact' into development