Cherry Picked Early DPI feature