Merge branch 'bugfix/notification-nil-actor' into 'develop'