Merge stoney-cloud changes and drop old.