Merge branch 'fix/subscription-notification-view' into 'develop'