Close #615

#615

Probably wait until #607 is done.