Implement a safer and more predictable interpolation approach.
Closes SF bug #511737.
3 files changed