Don't do Some(null)
Merge branch '2.2.x_2.9' into 2.2.x_2.10