Fixed merge vars bug, when content is null set it to empty string
Merge branch 'feature/166' into develop
Fixed Bug in editing RootLevelFilters, deselect unused values
Merge branch 'feature/166' into develop