Squash merge of https://github.com/morluto/rea/pull/2754. Co-authored-by: Adkid-Zephyr <laufs0310@163.com>