CHANGES for #418