Merge from Ankama's version