Merge "Fix comparison between signed and unsigned error on darwin" into mnc-dev