Merge branch 'throttling' into release