Merge "Use a different place holder name for string"