alert to dialog
Merge remote-tracking branch 'origin/iter3' into iter3