Merged to newer version.