Ee 6 2 Release

Merged username-removed-5302 requested to merge ee_6_2_release into master