CHANGES for #496