[8.0] Forward port branch '7.0' until a72d179

Auto merged without conflicts