Merge DarioGT fork