Eng 5400 Many different k-safety fixes for elastic join - don't merge yet