Merge branch 'wmdrawer' into next