Merge "Fix designate in AIO model"