Fix for integer compare type
Merge branch 'garth/merge-fix-119' into next