sync with cmrivers