AI-518 - refactored ConfirmDialog according to Alex's suggestions
Merge remote-tracking branch 'origin/version3' into version3