Issue: #1653