Merging public version.