WIP: Aruba switches #103

Draft
jeltz wants to merge 10 commits from aruba into master