merge changes from 4.3.8
update name
Add escaping throughout where missing
Escaping.