Merge branch '1813-throttling' into 'develop'