Merge branch 'ce/https-public-key-pinning'