Ticket #3183
Ticket #3181
Merge branch 'develop' of github.com:meedan/meedan-checkdesk into develop