Merge "SF: Split FE and CE"