PFC-2416 #comment adapting to Path-API