Fix strange behaviour of notification(hopefully)
Merge remote-tracking branch 'github/develop' into develop