Merge branch '2099_fileop_delete_dialog'