In progress ...
Merge branch 'master' into fixing
Fixed showing dialog
Cleaned imports