Merge branch 'fix/apache-cert-chain' into 'develop'