Merge "Update the feature bug in aconfig" into main