CE upstream

Merged username-removed-128633 requested to merge ce_upstream into master

No conflicts!