comments and dialog popups
Merge origin/master