Ticket #1307: Optimization to the watch callback function
Merge branch 'develop' of github.com:meedan/meedan-checkdesk into develop