Merge branch 'refs/heads/t/wma_improvements'