Fix value_type.
Merge branch 'develop'