Update changelog
Merge branch 'feature/certification_2' into develop
Merge branch 'develop'