Merged with upstream to version 2.10