Merge "Remove conversion from dollar sign to dot"