Merge "update_verifier: Verify blocks" into tm-qpr-dev