Feature Request #1460