3.9 content upgrade backport II