Merge branch 't/wma_improvements'