and bring all the changelogs into master too