Mt 14717 2

https://youtrack.mindtouch.us/issue/MT-14717
Reviewed by Arne