Added one of two fixes to see if this fixes build in Jenkins. To be

immediately merged with dev to start testing and build verification.

This needs to be merged immediately in order to start Jenkins build. We merged with dev before and everything still builds and works.