Introduce aheui_comp
Update for upstream changes