New version to fix conflicts by recent merge.