#3714 for 3.6