CHANGES for #417