Tweak .clone() suggestion to work in more cases
#118076
Merged
.clone() suggestion to work in more cases
#118076