Merge Adrian Broher/Marcel Metz into Marcel Metz