MERGIN 2.4 changes back into trunk