closes GH-52