Merge "Do not use block_verify on target-files where feature is missing."