CHANGES for #516