SV-1335 some refactoring and additional delay to prevent throttling
Merge remote-tracking branch 'origin/master'