Merge "Verify certificates" into klp-dev