Migration to MATE 1.6