Merge branch 'feature/issue-809-redis-scan' into develop