cec rebase for 3.14.y + fixing the nosync problems