Merge "Temporary fix for NPE crashes" into main