rebase blktap3