Merge branch 'features/JAL-1812_JAL-2083_groovyBinding' into develop