Merge "fix null safety issue" into main