Revert "merge 6.3.x into MasterBugFixing"

This reverts commit 3e88462e14bcb8d3771698b64447103158faa078.