Merged changelog entries from versions 3.8.5 and 3.9.1