Merge branch 'feature/JAL-3063jaxbNoCastor' into develop