Merge pull request #1721 from ehds/fix-code-annotation