Merge commit '750f32117b96a8af4fb03fae459a80f79a667fca' into kraken * commit '750f32117b96a8af4fb03fae459a80f79a667fca': Throttling framework addins
Merge commit '750f32117b96a8af4fb03fae459a80f79a667fca' into kraken * commit '750f32117b96a8af4fb03fae459a80f79a667fca': Throttling framework addins