Merge "[CEC Configuration] Move context to constructor"