Ark
Backport #30224 by @Zettat123 Fix #30220 Co-authored-by: Zettat123 <zettat123@gmail.com> (cherry picked from commit 895d2795abe79cc2e87b35d39cb7d09b9234b06d)