CMS-3718
Merge pull request #844 from enonic/CMS-3718

CMS-3718