build: sync with CM