Merge remote-tracking branch 'origin/develop' into bugfix/ZP-836-recurring-tasks-duplicate-in-ol-2016