2.1.10 upgrade question