2.21.7

Merge 2.21.7 from upstream. This contains the merge ILP proxy attribute patch, so we're back in sync with releases.

What's Changed

• Synced to latest commit from upstream repo by @mdilena in #3

Full Changelog: 2.16.0.1...2.21.7