Merge branch 'hotfix/1.18.20' into stable
1.18.21
Merge pull request #1686 from funny-falcon/falcon-fix

fix leak in falcon patch
Merge branch 'hotfix/1.18.21'