add popup dialog
merge from develop