Add Changelog
Merge branch 'new_branch_name' into rubble