Issue created: #2031