Implement #1953
Updated CHANGELOG