Fixing claim.task message bug.
Merge branch 'develop'