Merge changes from unstable
prepare changelog