Merge "Change to null safe comparison" into main