Sync with MATE 1.6