Merge-ready version.