stable sync
more changes to stable sync