[dist] sync with 2.4 branch