CHANGES for #399