Merge branch 'release-2.0.2' into develop
Implement hot-swappable indices
Version 2.1.0
Merge branch 'release-2.1.0'