Update CHANGES with fix #2173.