Merge branch 'features/JAL-2068groovyAnnotationWorker' into develop