Merge "Fix nullability annotation" into main