release-20.5
Updated the static link macros
Fixes for building without various 3rd party dependencies