cw-703 cw-704 cw-662
Merge pull request #348 from EU-OSHA/cw-703-short-mess-press

cw-703 cw-704 cw-662
Merge remote-tracking branch 'origin/sprint-5' into develop