Merge "Fix NullPointerException issue due to threads race" into main