Replace Optional[T] and Union[T, None] with T | None

Replace Optional[T] and Union[T, None] with T | None #1380