CHANGES for #520