Merge "Verify certificates" into jb-dev