Code

changelog: Merged all entries.