fix settlement for history/random
adjust parameter
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Adding min rate calculation.
Merge remote-tracking branch 'origin/master'