custom column count per section
Merge branch 'per-section-column-count' into develop