Merge branch 'ds/ewah-cleanup'