Added support for annotation inheritance.
Merge branch 'develop'