Updated annotations processing.
Merge branch 'master' into release
Updated annotations processing.