AI-581 - skip dialog
AI-581 - skip dialog : bugfixing