upgrade mainline to 2.4.0