Merge "aai sparky be config alignment"