manual merge of latest fbtft