Ticket/12426 PF-search