Switch to IP-based PV association for persistency, following what was done here: Rec!3460 (merged)
@mveghel