Multiple fixes for task-case relations
Merge remote-tracking branch 'origin/master'