Merge "Fix null handling"