Merge latest csm2to3 changes