Merge branch 'tc1100-wmi' into release