Cherry pick dev#356

LBern wants to merge 2 commits intodevelopethz-asl/maplab:developfrom

feature/merge_aliceethz-asl/maplab:feature/merge_aliceCopy head branch name to clipboard