Adding hack for cflocation onError bug
Merge branch 'develop'