pod patches, via RT#75584