Fix problem with function having ambiguous signatures.
Merge branch 'master' into 19550