Merge "Use definition of afm_prefix"