Migrate to 4.2.1