DataBinder unwraps Optional objects and allows for proper handling of Optional.empty()

Issue: SPR-12241
Polishing