Re-add Otto annotation handlers

Fixes #1133.

@yDelouis I think we should quickly resolve the branching issue what i already noted. Until that i would not merge any PRs.