RE: migration from 2.0.16