use 2.5.3-+ in wip-2.5