unbundled build fixes
Merge remote-tracking branch 'origin/unbundled-static-build' into develop