Merge "Support custom user strings." into main