Merge branch 'kd/auto-col-with-pager-fix' into maint