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