Fix strcmp include in lib
Merge branch 'master' into builds
7.423