XFA: merge patch from issue 726033002