PRD-5079 - Fixing fatal build failure and illegal file
Merge pull request #386 from tmorgner/PRD-5079

PRD-5079 - Fixing fatal build failure and illegal file