Release 2.2.18.3
Merge to upstream 3.12.22