Fixed #82200 by adding wait dialog.
Merge pull request #144 from luisromangz/8.5-SNAPSHOT-82200

Fixed #82200 by adding wait dialog.