CE upsteram

Merged Valery Sizov requested to merge ce_upsteram into master