Merge "Fix the NPE problem." into main