Ark
Try to fix #31884 Fix #28584 (cherry picked from commit 286ede47ad683bf0431e531e82019cd016cc54dd)