Annotation selection
Merge pull request #3431 from timvandermeij/annotation-selection

Annotation selection