manually merge some awesomeness from FT0/Carrox