Merge branch 'ath-next' into ath-qca