Merge pull request #2182 from cfi-gb/add_escalate

Add corrections for escalate and variants.