Backward compatible changes to prepare for change in DataHandle option

see gaudi/Gaudi!1159 (merged)

I'm pushing a bit the validation of this change as I have to merge the change in Gaudi to release it.