Resolves #5594 Co-authored-by: Glavo <[email protected]> Co-authored-by: 3gf8jv4dv <[email protected]>