Co-authored-by: Jonne733 <[email protected]> (cherry picked from commit 7782a17bc2fd663e6c7ec8420bade36c40c4ad25)