CHANGES for #366, #369