Merge from JooHyun

It has finder dialog.