portal-mdek-app [branch 3.5_REDMINE-304]: - merged from master (to avoid errors because of changed external lib), see https://redmine.wemove.com/issues/304