We need to include 5.18 code in OSX builds!
Merge branch 'public/7.7' into public/7.8