Per review with Juergen in light of SPR-8413, which will revisit the overall structure of ACAC and ACWAC. Issue: SPR-8365, SPR-8413