Merge "fix warning: Null pointer argument in call to memory comparison function"