Resolved key warning in Task
Merge branch 'develop'