Fixed non-initialized value
Merge branch 'release-0.16.2' into crlf