Working migration to 3.4.1