Fix uninitialized-read
Merge remote-tracking branch 'origin/2.0'