Reland with update on test case ContinuousSyncmode/basic.c. This reverts commit fe5c2c3ca682b140dd5e640e75948363b6b25ef9.