CE upstream

Merged Valery Sizov requested to merge ce_upstream into master