Manually merge forgotten PD-related manifest changes