This Issue extends #157
This Issue extends #157