Merge branch 'fix-hwia' into 4-0-0