Add option for dev-2.5 branch