Merge "Add container to .aconfig" into main