Merge branch 'feature/issue-603-close-redis-connections-properly' into develop
Merge branch 'develop' into feature/issue-604-better-persistence-handling-in-tests