Toward #1607
Toward #1607