col3 col31 tuning
Merge remote-tracking branch 'origin/v1.1'