(Issue 1687)