Add remaining changeset (r29080) for PMI update