DF#QCADOOMES-1752 fixes in listener
Merge branch 'master' of github.com:qcadoo/mes