6.3 EE release

Merged username-removed-5302 requested to merge 6_3_ee_release into master