Merge pull request #3844 from Safety0ff/wconv

Fix comparisons functions
Merge pull request #3854 from AndrewEdwards/2.066

  Cherry-picking commits from master to 2.066 branch (for RC2)