CE Stable to EE stable

Merged Marin Jankovski requested to merge stable_to_ee into 8-3-stable-ee