Merge branch 'tests/notification-smoketests' into 'develop'