Merge pull request #1685 from Areloch/maxRainDropBatch