Fixing issue #923
Tweaking onRequestStart logic
Tweaking onRequestStart logic
Tweaking onRequestStart logic
Merge branch 'develop'