(Issue 1634)