AI-664 : preparations to subforms ui