Still fixing quote problems
Merge branch 'master' into 19552