Merge branch 'boatd-cleanup'