Just reordering some code.
Merge branch 'master' into new-annotations3