Merge "set container for aconfig package" into main