CHANGES for #309