Issue #3151
Merge branch 'feature/2.0.0' of github.com:meedan/meedan-checkdesk into feature/2.0.0