Merge "Fixing null check causing test breakage" into main