Enable clustering in annotations
Merge remote branch 'upstream/master'