Squash merge of https://github.com/morluto/rea/pull/2756. Original pull request submitted by @xu91102. Co-authored-by: hhang <169027046+xu91102@users.noreply.github.com>