Commit to update branch with last develop commits and resolve merge
conflicts and to remove the call to getValue function with argument null
as it is possible to use directly getValue() for driver with 1 span