2014-12-16 sl Merge field unification changes and client recovery feature.