CHANGES for #397