Merge "Nullability Annotations replacement" into main