Merge "[AAPM] Add abstract class for feature hooks" into main