EPG-30179: new wrapper version