Represent original value from a binding as an option
Merge branch '2.2.x_2.9' into 2.2.x_2.10