Use legal maximums instead of max over time period.
Merge remote-tracking branch 'origin/master'