Merge "Refactor nullchecks" into main