Merge "nullptr check on suffix." into main