Merge some new changes from Dorimanx