Default certificate was never used
Merge branch 'refs/heads/development'