Merge "Modify dmi plugin stub mapping of data operation"