(Issue 1686)