Refactor annotation pointcut classes to use only single class
Merge remote-tracking branch 'origin/0.x'

* origin/0.x:
  Refactor annotation pointcut classes to use only single class