closes issue 3595187