Merge branch 'feature/fix-changelog' into feature/fault-handling

2 jobs for feature/fault-handling in 1 minute and 2 seconds (queued for 6 seconds)