Merge "Null check some nullables" into main