Implements #68 (closed), #77 (closed)
Integrates !19 (closed)
No changes between version 6 and version 6