SailFin: Join and Replaces support, Part II