add latest changes to dialog-impl