Merge tag 'v0.6.5.6'