Merge "Rename ACONFIG flag and add flag wrapper" into main