Reverted a dangerous change in a utility method with high usages number.
Merge remote-tracking branch 'origin/master'
rerun failed tests env tests added
Merge remote-tracking branch 'origin/master'