Reapply Justin's nullable types changes after production update