(Issue 1494)