Merge "aai model loader config alignment"