FLUID-4330: Removed "reverse merge" and tests, added non-api comments