merged upstream 2.4.7