Updating compiler check to match what it's onRequestStart
Merge branch 'develop'