Merge "Removes duplicate NULL check." into main