(Issue 1754)