Adding hack for cflocation onError bug
Adding double check to ensure that new values are boolean #1430
Merge branch 'develop'