Merge: Fix escape to c