Merge CE upstream

Closed Valery Sizov requested to merge ce_upstraem_8_1 into master