Merge "cleanupOrphanPA's feature framework (2/2)*"