Merge "Towards fixing Tycho problems (2)"