Merge "qca: fix kw issues"