Align to latest PA manifest changes