Migration to 1.6