fixed rate functionality
Merge remote-tracking branch 'or/master'