Another massive commit, see CHANGES.md