Patch after the UseDollarString implementation
Authored by: matfanjol 2016-04-23
Parent: [r309]
Child: [r311]