Merge branch 'features/cleanup-incoming-actor' into 'develop'