Migrated in new changes from Fenoxo's upstream