Fix block matching in the case that you're inserting an entry.
add support for validating tags. Fixes #6237
Merge pull request #6238 from ros/fix_block_matching_edge_case

Pull request to fix #6237