Updated annotations processing.
Merge branch 'develop'