Avoid unnecessary &str to String conversions
#103726
Merged
&str to String conversions
#103726