Merge "Fix NullPointerException" into main