Merge "Update to check if the s2cellfile is null" into main