[EAP6-17] Forward port changes needed to get tests passing