Adding support for interceptor injection via annotation
Merge remote-tracking branch 'origin/master'