Merge commit '2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e' into kraken * commit '2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e': Misc fixes for throttling.
Merge commit '2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e' into kraken * commit '2f8c9e6825e31614f26f8d9f3c1de7be2f3e9f9e': Misc fixes for throttling.