Merge "Convert name_suffix." into main