Merge "Extend the APMg3 AOC control to handle more profiles" into main