Just closing the loop here - @merefield has now made the necessary updates to the Pavilion theme component, so it should work well both before and after the incoming core change 
2 „Gefällt mir“
Just closing the loop here - @merefield has now made the necessary updates to the Pavilion theme component, so it should work well both before and after the incoming core change