Merge branch 'develop' into improvement/JAL-3438_eclipse_java_code_formatting_as_a_gr...