Merge "Fix a ClassNotFoundException raised during demarshalling"