Too much scribbling on _ColReorder_iOrigCol.
Merge branch 'ColReorderWithResize' into sbt-package