Merge branch 'fix/notification-type' into 'develop'