[sr-dev] New commits on branch alexh/dialog-sync-wip