Merge "Update oob data struct"