Merge latest changes from Dorimanx