PRD-5079 - Fixing fatal build failure and illegal file