Re-enable this-escape warning, suppress as needed
#2953
Merged
this-escape warning, suppress as needed
#2953