Merge branch 'wip-annotation-skipping' :thumbsup: