I updated the KMP again with the latest fixes from Michel. Tomas, could you check again the KMP later?