Squash merge of https://github.com/morluto/rea/pull/2464. Co-authored-by: Thang Luu <[email protected]>