canonical_annotation has been retired, removing leftover variables
Automatic merging of dev into master

* dev:
  canonical_annotation has been retired, removing leftover variables