Merge @zeisele 's work on the ground station into master
assigned to @zeisele
mentioned in commit a36b1666
merged