Fix init warning.
Merge branch 'develop'