Sync CSSCore from upstream