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