Merge "Generalize some PANS methods"