Port over latest rule chain updates #568

Closed maxsibilla closed 1 month ago