closing feature #6088