Closes GH-826