[3.8] Master fix1210