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