Implement #1903
Updated CHANGELOG