Merge latest changes for WSC dialog and file system running