Merge "Revert^2 "Nullability Annotations replacement"" into main