Changelog for #311, #312