Merge "Restrict the verification in block-based incremental OTAs"