Fork for IVI: mesa fixing