Transfered 2 changelog entries from hotfix-changelog and enhanced them