Expand changelog for #161/#987