...
Implemented #607, #608