Merge odo branch about bug #495948