Merge "Fix non-null check crash" into main