Merge remote-tracking branch 'origin/6.3.x' into 6.4.x

Merge remote-tracking branch 'origin/6.3.x' into 6.4.x #1547