Merge branch 'release/0.6.2' into develop
Ditching unnecessary certificate behaviour.
Merge branch 'release/0.6.3'