CE Upstream - Monday

Merged username-removed-444 requested to merge ce-to-ee into master

Once the conflicts resolved, please push (no force-push!) to the ce-to-ee branch.

People mentioned here are picked by git log -1 -- FILENAME. If you are wrong person to resolve the conflict - please ping me.

Thanks for help!

Edited by username-removed-444