Fixed issues with popup notifications.
Merge remote-tracking branch 'origin/dev'