Merge "Fix crash when comparing messages"