Fix bidirectional usage of JAXBElement wrapper
Merge branch 'feature/JAXBElement' into develop

* feature/JAXBElement:
  Fix bidirectional usage of JAXBElement wrapper