qca: prep for PR