Merge pull request 'Add index hotspots' (#32) from hotspots into develop