MODE-1887: Merging workspace

MODE-1877: Fix for issue workspace merge