Merge branch '2873_diff_escape_dollar'