0005356: APC + modules (cherry picked from commit fd74a9f)