Merge "upgrade verifier version to R5" into jb-mr1.1-dev