Update changelog and add format file
Merge branch 'master' into develop