(cherry picked from commit 36304fc89dffe99fc1e05e2b9865fbf562d43650) Co-authored-by: Yureka <yuka@yuka.dev>