Merge "aconfig must have the same container with the declaration" into main