Merge "Suport variable blocksizes in dm-bow restore"