Merge branch 'master' into develop
Circular reference in AnnotationsCacheFeature
Merge branch 'develop'