Fixing persistence in column selection
fixing conflicts
Merge remote-tracking branch 'origin/aws' into aws