6.4
Merge remote-tracking branch 'wgm/6.4' into 6.4