Merge "[AAPM] Add Feature class" into main