Use lombok sneaky throws instead of rewrapping.
Merge branch 'develop' into feature/CORBA