Reverted changes from merge conflict to dp_info.