Fix OnionKit build issues on 7.1 SDK
Merge remote-tracking branch 'origin/2.3' into 2.3