(Issue 1764)