Fixing MDK 3.2 compatibiltiy
Merging