Merge branch 'bugfix/x509-public-key' into 'develop'