Fixes #27060 --------- Co-authored-by: silverwind <[email protected]> Co-authored-by: delvh <[email protected]>