Merge branch '1657-annotating-should-be-a-separate-job-that-can-be-run-at-any-time' into 'development'

Resolve "annotating should be a separate job that can be run at any time"

Closes #1657

See merge request !1874