landing 3.8.9 on 2.1 branch for 2.1.3