Dr 118 3

https://youtrack.mindtouch.us/issue/DR-118
Reviewed by Steve, Arne