Merge branch 'refactor/notification-controller' into 'develop'