FORGE-1310: Fixed distribution build