Merge branch 'fix-163'
v0.29.2
Merge remote-tracking branch 'upstream/master'