Merge from avbdr