CHANGES for #505