fix problem with unsafe comparisons
Merge branch 'master' into remove-consenv-args