Merge "add is_valid to oob data"