MXGDA-1781 (8.38) Add diagnostics/workaround for org.omg.CORBA.MARSHAL: Null References problem
Merge remote-tracking branch 'origin/8.38-hotfix' into 8.38