Issue #23507:tweak implementation files