Merge branch 'feature/aop-class-name' into develop