Merge test by RobinSeaHiker | SimScale