Migration to 3.4