Merge branch 'transrate'