merged with upstream 2.4.6