Merge

...od for the positive dialog button.