Merge branch '2053-notifications-actor-is-active-refactoring' into 'develop'