MODE-1887: Merging workspace
MODE-1887: Remove commented out lines
MODE-1887 Removed commented out criteria in if-check