Merge "Revert "Nullability Annotations replacement"" into main