Added flexible migrations to 3.3 branch