Merge branch 'btcrate'
Merge remote-tracking branch 'tfmod/develop' into develop