Merge "Fix compilation error on emerald-dev" into cw-e-dev