timob-14761: Refactor add/remove annotations
timob-14761: update zip and changelog
Merge pull request #3 from hieupham007/timob-14761

Timob 14761: Testing steps in JIRA