Merge branch 'da/t7800-cleanup'