Update cwac module
Merge branch 'update-cwac-module'