Remove todo comment.
Merge branches 'master' and 'develop'