Merge branch 'master' into develop
Removing Redis as an option for annotations caching.
Merge branch 'develop'