Agreed, I guess we also need a rebase on this PR (master doesn't have annotations anymore)