PRD-4558: Build file fixes