Changelog:  more bug-fixes which are fixed by the same commit.