closed #4636. Done